Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 11 Jul 2010 22:57:47 +0000 (22:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 11 Jul 2010 22:57:47 +0000 (22:57 +0000)
commit3c500a54c82b2512f6490250474f10ed07d233e4
tree97ed5423f6ddd32739065fc79aa4ce232586fd31
parent50385319b04c74ee743643190804d5bad50e9646
parentd73587239f6138913e9a44114dd4f4aa78d1bc3d
Merge from mainline.